bitkeeper revision 1.1159.231.3 (41f8f05dMzf8t3Dot3Utpuos9U5nYg)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 27 Jan 2005 13:45:01 +0000 (13:45 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Thu, 27 Jan 2005 13:45:01 +0000 (13:45 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk


Trivial merge